Merge "Track libcore change 9fbdd1b27de1a3d1005468108." into nyc-dev am: 8bff8a4e47
am: ceda51e563

* commit 'ceda51e563786c1e3372b4197db351b2d3969144':
  Track libcore change 9fbdd1b27de1a3d1005468108.