Merge "Track libcore change d7d594236d66c4d595f7622a264fd51." am: 97ebc29e9c am: b872486722
am: 26e655f397

Change-Id: I85b862ddf9f0e1b5dc48197075616bebdabf8c1a