Merge "Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a"