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

Change-Id: Ie29819a985dfd8400ec62d080c3d999c5571c03c