Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a am: ab3d167f06
am: 3606de0fb4

Change-Id: I65867f77e21821fdcd62247bf242def4807f09dd