Merge "Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24." am: b1bf1cd066 am: ff92741c16
am: e6e3300773
* commit 'e6e330077377979685a9fda9e60d544c6b20b18a':
Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24.
This commit is contained in: