Merge "Allow framework-atb-backward-compatibility to be added to bootclasspath"