Merge "Avoid preloading classes for boot image profiling"