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

Change-Id: I7004af3efeb80f7f9ac4615ca2a2c0b72617e31f