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

Change-Id: I4f1af737b73aeb4db52fdff1782ac8b1ea078a96