Merge "Use APEX boot image for profilebootclasspath"