Android Platform 11.0.0 Release 6 (RPM1.210413.002)
Convert Android.mk file to Android.bp am: c60ef2a38b am: 892b13dc96
am: f7bb4456c0

Change-Id: I269d33cf7e4dc4dc46ea70207d7412c4e1d1aa94