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

Change-Id: I41b5de61a6edee2fa71b36805a4af109179ca4d8