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

* commit '8d6c2680b4f0194ea48a3d56dece9bf80d35c5a5':

Change-Id: I26fbcf175963012b0c3b801e1e06e41ccbc51fe4