nfc: Android.mk -> Android.bp am: 238dd8a83c am: 570e021780 am: df032be4c9
am: 334c0e19fd

Change-Id: I861d6135d90bb6618daf77992d14cc5b41fa4dfd