Merge "Revert "Build: Support for compiled-classes file""
am: 1cd44482db

Change-Id: I93c46ba84df49662ed161134f9b8b9ce406f8ac1