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

Change-Id: I2396585a08a006bc1dc062d69c6d0f74ecde4005