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

Change-Id: I48fa3fbc8b9f2859a084bf36d06117a1ea8970cf