am c3d49ddd: Merge from AOSP

* commit 'c3d49ddd224af8d6d89c8c95b229758a2f090c8d':
  New host gcc prebuilt for MacOSX