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

* commit '9c69970a9baf61fa24227434a669ca4863f63c19':
  Remove workaround for libart greylist.

Change-Id: I65ac7f07c96598b7f18ba8928fe5c3bd085a189d