Correct cherry picking of emulator-base's build configuration; Allow blank string...