Merge \\"Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b\\" am: cf5b00e6bc
am: 43714397df

Change-Id: I4b546015058d9ca959dadfbaf6f510182c2a47ca