Merge "Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24."