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

Change-Id: I852b8efb010fecf7079679694c45d6d8300ea408