Merge "Otapreopt: Fix after shared-library work" into nyc-mr1-dev am: 3dfafe3891
am: d6b4cb2495

* commit 'd6b4cb2495066b6104e7617e76bdc18ab0ef5560':
  Otapreopt: Fix after shared-library work

Change-Id: I996b105c9aa1689ae059c6883e0ab7a309d3c50b