Merge "Start on DexBuilder" am: 3e7d810a2f
am: d4d3e215d7

Change-Id: I53a805e27818f4792b0ce18641d3b0710a0c7162