am 0edcf8e9: Merge "Fix OSX emulator-[arm|mips] debug builds"

* commit '0edcf8e9287a882803449dcf514efb3eacb5e1cb':
  Fix OSX emulator-[arm|mips] debug builds