Merge \\\\"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\\\\" am: f388075f8f am: a153a22f80 am: 48e5206081
am: f89aa7e756

Change-Id: I0d5798c436ac88222f48415d3a3174dcfcc09a1b