Merge "Convert dx to Android.bp" am: c80e4f68e8 am: dd57b8d823 am: 3f14829f97
am: f6a54bd18c

Change-Id: Ia62997b1318f433ed6c330f570e7a4700fceff8c