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

Change-Id: I2476afff1972e255525c6dd2d32874d2aaae9926