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

Change-Id: I122a8f00652adf4134aef85e7af3d4ca79b56518