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

Change-Id: I7ab01e2531d9d684759bdd2e9a5410288cfd52b4