Merge "Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c"