Merge "Remove workaround for libart greylist." into nyc-dev
am: 595efd0

* commit '595efd04db3970180d2a2de97524ac5e9a421a25':
  Remove workaround for libart greylist.

Change-Id: Ia42dfbad1f4c39592b8534eb16fbfe77444a46b7