tree 2811fe42d6e98e357b28017a6fa3146ba5d33d45
parent 1ce26af6d14810a277a5f62a5619a372b93183cc
parent db780cb119b604c1998cc91ae73e8c9439c540be
author Dan Stoza <stoza@google.com> 1482949492 -0800
committer Dan Stoza <stoza@google.com> 1482951596 -0800

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