Merge "Remove unnecessary direct dependency on dexmaker"
am: b33ebabb85

Change-Id: I00794ec62d345764f283c5854d69c58963d628ab