Merge "Track libcore change d7d594236d66c4d595f7622a264fd51."
am: 97ebc29e9c

Change-Id: Ied575c14661753a56241f0cea62391b057ab4316