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