Merge "In boot image experiment mode, treat boot classpath classes as verified." am: c76c4cc423 am: 8ab05be294
am: 8906dadac9

Change-Id: I8d40ce1deee4ce816a3111a00635f25f3e40ca3b