Merge "Allow framework-atb-backward-compatibility to be added to bootclasspath" am: b751443fdc
am: 064a2fdd20

Change-Id: Ifd6c944b9fa8cea1154eed674c234c473955dff7