Merge "Switch ahat test to use core-optimizing-pic.art." am: 0ba73a9970
am: 2a991b8dfd

* commit '2a991b8dfd87563d13e6bdde562297ced1d2a407':
  Switch ahat test to use core-optimizing-pic.art.