Merge \\\\"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\\\\" am: 47ef3bf172 am: d37e23c50c am: 720f31e238
am: 90e517991b

Change-Id: Iac9e82f2ca567d8f56d556f5dd0a8339cccb153e