am b63ff273: Merge "Remove the Android.mk GCC-only source files hackery"

* commit 'b63ff273375c488fae2555fad4e5873d3613aa5d':
  Remove the Android.mk GCC-only source files hackery