Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7"
am: 94adc6c

* commit '94adc6ce96c4405134141e4e7a7ff8512e2dda1b':
  Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7

Change-Id: Ie844dfe438d37abd1f708b149be51a611b7e7044