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

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

Change-Id: I592b385458226220cdbb4ae4bd0c1384c590b7f1