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

Change-Id: I5fe374eeb5beeafcaa8f32bb873cc419e56a0abe