Merge "Convert to Android.bp" am: a4c863fab6 am: 29ea54f068
am: d32d6b321e

Change-Id: I7024f1990130bca93fa4b3eea5f87ee0e502b79c