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

* commit '4b0fd876600d41567744cc76bd572c8d2b31ea7e':
  Revert "Emulator: enable predexopt for some sample apps"

Change-Id: I3f43230d40612cba121f4b9750dfa0a5c981eee7