Merge "Track libcore change 5731615b4d705b5af63a3126d84b8786862477d."