Merge "Track libcore change 2c0c8889ff415431e3c2d6d5ac95748f8b284384."
am: 079f5fd587

Change-Id: I866c7dcf54b3d9ad59d8a80bc9346481eb0e7f49