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

Change-Id: I20614099a342c5ff2db14633c17672d471f72831