Merge "Build: Only use compiled-classes file when available" into nyc-dev am: 57c3aea442
am: 5d558c5f13

* commit '5d558c5f13dbff6e6e51e543f86cc6ff66be630a':
  Build: Only use compiled-classes file when available

Change-Id: Ia64b363e5cbf7b7a6794332fea39b79f010435e3