Merge "Revert "Add bootclasspath_fragments to platform-bootclasspath."" into sc-dev