Merge changes I5dd60978,I0c2b804c

* changes:
  Remove code replacing core.jar -> core-libart.jar.
  Remove obsolete code related to patchoat.