Merge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621"