Merge "fix mmap fd leak inn HIDL audio stream" into oc-dev