Android mainline 11.0.0 release 3
Merge "Convert Android.mk file to Android.bp" am: 67b20324c8 am: 8ca20f3a0a
am: 9d7ae289b1

Change-Id: I717635d51c3e86541be0045a72619f1d69bfe5be