Merge "Add AES-CBC mode to NDK's CryptoInfo" into nyc-dev