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

Change-Id: Ib9462093cf0a6794950d3260b53754cb4c15389e