Merge "Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH"