Convert Android.mk file to Android.bp am: 35a7baea1f
am: 89eebf20cc

Change-Id: I70400321ba96c082a9bb034a710b8ec6df697d48