Convert Android.mk file to Android.bp. am: add3da1d38
am: 29520b3023

Change-Id: I87345c16ed51a6a0e26dce980758aa90e862d441