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