Merge "Convert external/dexmaker to Android.bp"
am: a3bc7e013a

Change-Id: Ibab92be5a0f29723a3b56e5d00ef2572ea51e896