Merge "Convert Android.mk file to Android.bp" am: 5656a003e6 Change-Id: I02caba665b20451d2b2fbb23eb1f1b4d10f66fa5