Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7"