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

Change-Id: I91acc07284cb87693358eeab369465fdfc3dbcfc