Merge "Convert Android.mk file to Android.bp" am: 6cb9de0e1c
am: a2e5c1fb8a

Change-Id: I209dc38daf368dbde288749f75a029e7fc8f0842