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

Change-Id: If36eebf790e97f102667afd5075597844c29e229