Merge changes I4a2692f3,Ifd8d3a2c into nyc-dev

* changes:
  Build: Only preopt boot images in eng builds
  Revert "Don't preopt on eng builds."