Merge "Track libcore change d7d594236d66c4d595f7622a264fd51."