Merge "Build: Only use compiled-classes file when available" into nyc-dev