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

Change-Id: I4bed31c7927ed71a942c91ed618af5b708e3b568