Merge "Track libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc." into nyc-dev am: e41718d4f7
am: 10b9fb8556

* commit '10b9fb8556f6efdf4b015a7bf3daef654c3e0935':
  Track libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc.