Merge "Convert Android.mk files to Android.bp."
am: a1b87e9f3a

Change-Id: I82273b0c8fdb0605265a54a68ff64eb6d952866a