Merge \"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\"
am: 47ef3bf172

Change-Id: I15352fb15ffb6d427ddf92cb084c2cfc4c0f8368