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