Merge "Track libcore change 2115cc0ca7d60965a361129d8826478ff2d847e4" am: e8f7b80
am: 6120fe1

* commit '6120fe13463ee7c6b9b0c38de5d0b51171ad831e':
  Track libcore change 2115cc0ca7d60965a361129d8826478ff2d847e4

Change-Id: Ia3034e8a4fb7017c07459af62bd6d9ebc7420513