Merge \"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\"
am: bad21cb538

Change-Id: I327c5c1d906f5fea59797bc7ff79578dcef510b4