Merge \"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\"
am: f388075f8f

Change-Id: I5f595620ecea5f4f05da90673414b7b130c7b848