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

* commit 'd5f110f1639cae912478359edfe6d75002fabfef':
  Remove workaround for libart greylist.

Change-Id: Ic49cfde7ef49d6487beff66f3d7e273606db4f74