Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" am: 29926838 am: 40dfadda am: 004ae3ae am: 9022cf0c Change-Id: Ic50e0daa27503660cce8f65a3fbb84f8ee5d323e