Merge commit 'bdd33184' into dalvik-dev * commit 'bdd33184': Don't leak sensitive information when logging cookies.