Merge "CVE-2013-0169: Make CBC decoding constant time"