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

* commit '7951c60eb2462ede6a508f10fd657d594ef0e84d':
  Track libcore change 2115cc0ca7d60965a361129d8826478ff2d847e4

Change-Id: I9d6cf148e362099781510cf56654ba41bab97e65