Merge "fix BUILD_DEBUG_EMULATOR build"