am 89897723: resolved conflicts for merge of 3a2b9f0a to lmp-mr1-dev-plus-aosp
am 89897723: resolved conflicts for merge of 3a2b9f0a to lmp-mr1-dev-plus-aosp

* commit '89897723ea6f197168c8aa4a58b5aa1b4ba635e1':
  core: OSX: Support 10.9 SDK as well

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build