Merge "Convert Android.mk file to Android.bp" am: 0081b3831b
am: 57c754bc37

Change-Id: I849ece800ad48a33bb4bd3caf14c2685b07ce803