Convert Android.mk file to Android.bp am: 93a3ae4bab am: 815468c7a4
am: b9677bb9c9

Change-Id: Idc0f65aefb8b854940beaed537fe3b7ef587bc4a