Merge "Track libcore change 5731615b4d705b5af63a3126d84b8786862477d."
am: 1529753

* commit '1529753b4cf748965d1d8f2dc81b2d9a2e9bd6d1':
  Track libcore change 5731615b4d705b5af63a3126d84b8786862477d.

Change-Id: Ib53c68b6cdba3fcda266a5af38497e1cb1dfeb86