Merge changes Ia55ae13e,Ib3e2e6d2 into nyc-dev
am: 0fca5f7

* commit '0fca5f75f56f59d68fc6d3a891302efbebd621da':
  Disable stripped-dex test for no-dex2oat.
  Disable stripped-dex test on target.

Change-Id: I82e0183b451dae790a81ee1c200efd777928b082