Merge "Start on DexBuilder"
am: 3e7d810a2f

Change-Id: I956b5edaefda774fe455180e133d5711a6d2f0f9