Merge "Build: add preloaded-classes and compiled-classes dependency" am: a0d201bd9a
am: bc166c799d

Change-Id: I38dc9783c694c82593e7056707a09e520a789aeb