Merge "add check to specify PRODUCT_BOOT_JARS"