Merge "Remove unused library framework-oahl-backward-compatibility" am: 2111aeb289 am: 6581b4116b
am: 14e472690a

Change-Id: I818ae412e68994c7ec32a13496064ae85457a6f7