Merge "Convert Android.mk file to Android.bp" am: 058cb93644
am: c044eea3fc

Change-Id: I239c6ee0ca0124dd32e96567303578fa7d367cab