am 41c939a1: am 44259e4c: Merge "Build: Support for compiled-classes file"

* commit '41c939a18698751d963bb57f9a0bc86ce4d3ec2e':
  Build: Support for compiled-classes file