Merge \"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\"
am: 36ce097dbb

Change-Id: Ida8dcbbd72df17bbcc49bbccc0cec562d4a6a0e7