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

Change-Id: I34568ed9cdbc1fdb3952a5141d03f1848095256d