Merge "Avoid preloading classes for boot image profiling"
am: cfee28589b

Change-Id: I9c7be76f96546d50a6e049aeab60ca71ee215500