Merge "Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24."
am: b1bf1cd066

* commit 'b1bf1cd066942c8b775d73396cdc986f776a4b4f':
  Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24.