Merge \"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\"
am: 1850851670

Change-Id: I6997e3b34d87cb091be99318ea1743c972ca1c84