Merge "Convert Android.mk file to Android.bp"
am: a2b4a33c84

Change-Id: Iffc1a113d033ae469854af705ee6c2472828cd81