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