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

Change-Id: Id2ce5a417668194821af47c2645e0d456f84a064