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

Change-Id: Ib6cdd80b18c5da0048c080dc00e115edaafde661