Merge "Remove unnecessary direct dependency on dexmaker" am: b33ebabb85 am: 5f8a055a1c
am: 9264e2d7c2

Change-Id: Ic76eb48cbe5ab523eabb26cedc4f2cc4925d1073