Merge "Convert Android.mk to Android.bp"
am: 0bbba1b525

Change-Id: If3f8835f77b52929a17a97a19fb33db5b1cce3fd