Merge "Revert "Emulator: enable predexopt for some sample apps"" into nyc-dev am: 4b0fd87660 am: 861f784752
am: 44de50be48

* commit '44de50be48ea9450d44e1aba6097c45de565c997':
  Revert "Emulator: enable predexopt for some sample apps"

Change-Id: If0ce23b2e2c8b51f451d90911623e5ab0dbc2a11