Merge "Convert to Android.bp" am: 1752ac1e55 am: 0476c6d079 am: 9ad2df7d11
am: c704149eb9

Change-Id: Ia64e2715037fa7b3a642aec9d7177a81a7f416e1