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

Change-Id: I3aadaccd191e59046db1ac138da71bbbc0261811