Snap for 4954419 from 0c6fa043 to pi-qpr1-release

        size_t *encryptedbytes) {

    // size needed to store all the crypto data

    size_t cryptosize = sizeof(AMediaCodecCryptoInfo) + sizeof(size_t) * numsubsamples * 2;

    size_t cryptosize;

    // = sizeof(AMediaCodecCryptoInfo) + sizeof(size_t) * numsubsamples * 2;

    if (__builtin_mul_overflow(sizeof(size_t) * 2, numsubsamples, &cryptosize) ||

            __builtin_add_overflow(cryptosize, sizeof(AMediaCodecCryptoInfo), &cryptosize)) {

        ALOGE("crypto size overflow");

        return NULL;

    }

    AMediaCodecCryptoInfo *ret = (AMediaCodecCryptoInfo*) malloc(cryptosize);

    if (!ret) {

        ALOGE("couldn't allocate %zu bytes", cryptosize);