Merge "Convert Android.mk file to Android.bp" am: c6ef1d2dc0
am: fb9b1617d6

Change-Id: I34059d7e95e063e02f2922f75675058f11c33248