Re-enable GCM and ECB modes.

Selectively reverts parts of bb845c81133c5796604dac0f8bfadd240689e543 and
4eff0f302729da0a7bd87847a5ba2ed155875d9b.