Merge "Fix native_handle leak in CryptoHal" into pi-dev am: 48710967

#include <android/hidl/manager/1.0/IServiceManager.h>

#include <binder/IMemory.h>

#include <cutils/native_handle.h>

#include <hidlmemory/FrameworkUtils.h>

#include <media/hardware/CryptoAPI.h>

#include <media/stagefright/foundation/ADebug.h>

        ALOGE("setHeapBase(): heap is NULL");

        return -1;

    }

    native_handle_t* nativeHandle = native_handle_create(1, 0);

    if (!nativeHandle) {

        ALOGE("setHeapBase(), failed to create native handle");

        return -1;

    }

    Mutex::Autolock autoLock(mLock);