Merge "Convert to Android.bp"
am: 9016ed8106

Change-Id: I04fb206a49f456a182ef3d649968ee0020b69ad8