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

Change-Id: Ife2190fa27996f78152e2bbe0fbb0649ac969acf