Merge "Track libcore change b5d045f7e4023c0ba9a42fb95efad4c30dfc085f" am: 32e9299fa6
am: 4042adc80b

* commit '4042adc80b025542b7bee712163bb2333c82443d':
  Track libcore change b5d045f7e4023c0ba9a42fb95efad4c30dfc085f