Merge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621" am: c895fcef8f am: 03e304e4e8
am: 0d53000386

Change-Id: I7e6064ba6d0b74584eec526d61ebb46abc02ad4f