Merge in upstream master after initial import

Also replaces the NDK Android.mk with an Android.bp for platform use.

Test: mm
Change-Id: I5784586573e3a0a67d728f7fc2441354dcece3b2