Merge "Add configinfrastructure to platform_bootclasspath"