Merge \\\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\\" am: 36ce097dbb am: 12bb15c1d3
am: 387191bc64

Change-Id: I4bede82fd01c3a80a67dadf545e9ffdc1ab7c8e0