Merge "Convert Android.mk file to Android.bp" am: ef6c4ed5c8
am: 3c435fce84

Change-Id: Ief8992562565b7c5081f6d4a19a5d66d6796b77d