Merge "Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7"
am: 67aaa079ee

Change-Id: I8b0bb02aca968de0baa7864cf4e123e4dd60b594