Merge "Track libcore change 848cf2e74b74b68c99b7b0a432263c3e57433fde"