Merge "Use APEX boot image for profilebootclasspath" am: 0726986b7c am: d10fe94410
am: 572ba49fd3

Change-Id: Id9100b957171921dedb9c798d94712e3dd872190