Merge "Remove unnecessary direct dependency on dexmaker"