Merge "Conditionally add the car bcpf to platform bootclasspath"