Merge "Convert Android.mk to Android.bp" am: 7ee95c3a50 am: 56698ebc6a
am: d25479d1ed

Change-Id: I6a6e39ea35a31b3771a17cbc89c2bb106b75a20d