Merge "Track libcore change 2c0c8889ff415431e3c2d6d5ac95748f8b284384."