Merge "Convert more modules to Android.bp"
am: 2141f9a6c4

Change-Id: I29f81471790a71e2542b65c32129a5fdc0cdb7ea