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

Change-Id: Iea9cf99e07272a4e5a6ae132825591d3508a5c04