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

Change-Id: Iaab8f3a6fc68ab42a4061cc68b3de92a4f859c25