Merge "Track libcore commit d41ca4a76ea570f9dd89a7ae56410cc75cc0a856"