Merge branch 'master' of https://android.googlesource.com/platform/build
No fstrict for Mako and Flo
Vfpv4
Merge branch 'master' of https://github.com/OpenMaster/build into HEAD