Android.mk -> Android.bp am: 1163465de6 am: b5f76c9dcb
am: 06f3b59c76

Change-Id: I184fc29cd78add8c524936973efebb2b507b7edd