Merge "Throw an exception if CipherOutputStream's cipher does."
am: cfef057e7d

Change-Id: I54f217d89182aeefe422868d8a76c231f9171a95