Otapreopt: Fix after shared-library work am: 548bdb9308 am: 261480f917
am: e7c131e250  -s ours

Change-Id: I2155a6d87870175ba7972ae9f4cc26bcbd38f007