Merge changes from topic "am-b39caaa3-4861-4759-a55f-8e0eb691097b" into oc-dev

                 buffer->size() + bufferRemaining);

            sp<ABuffer> copy = new ABuffer(buffer->size() + bufferRemaining);

            if (copy->data() == NULL) {

                android_errorWriteLog(0x534e4554, "68399439");

                ALOGE("not enough memory to download: requesting %zu + %zu",

                        buffer->size(), bufferRemaining);

                return NO_MEMORY;

            }

            memcpy(copy->data(), buffer->data(), buffer->size());

            copy->setRange(0, buffer->size());