Merge "Add --emulator-build-target"