Merge "Track libcore change f121f31fd91c5a557225cd6a97418e716529eb2d"