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

* commit '8bff8a4e47159385c0416a076cd8f98b72aa9cfb':
  Track libcore change 9fbdd1b27de1a3d1005468108.