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

* commit '3dfafe38915b9251eb2cc597be3efe60807c0e43':
  Otapreopt: Fix after shared-library work

Change-Id: Ie2e78d48f4766dd8b103c3d40b6b78a1ea42fbae