Merge \\\"Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968\\\" am: 326e55a3e2 am: ce482360b9
am: 8fbba5047f

Change-Id: I64fbc5c77f206fa3aaf496c91423ad441cfcc8f9