Merge "Revert "Cut down on object allocation in CipherInputStream""