Merge "Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce" into nyc-dev
am: 8c205b5

* commit '8c205b5a2d3b138dc95648188dd15a1abd7dd81e':
  Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce

Change-Id: I866ab8b93e50ee8ff9475634ef5a9f9443ef2e58