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