Merge "Convert Android.mk to Android.bp" am: a64fe320ae
am: bbdd15392b

Change-Id: Ie727c3f6c15cd57a78b08372b70d881600cf8a40