Merge "Build all the way to classes.dex for checkbuild" am: 41c7d8423b am: 9003bc7d4b
am: d186e1db6f

Change-Id: Ia040c655daf9c7649cd5e3732a67e346787786e5