Merge "Remove unused library framework-oahl-backward-compatibility"
am: 2111aeb289

Change-Id: I0ae3adfa825565c6e0f3321ace47dcee897eb337