Merge "Build: add preloaded-classes and compiled-classes dependency"