Merge "Track libcore change b5d045f7e4023c0ba9a42fb95efad4c30dfc085f"