Merge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621" am: c895fcef am: 03e304e4 am: 0d530003 am: 193c7d05 Change-Id: I2f31a97b8392a1085b485eed831fc67a57dc46ba