Merge "Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be"