Merge "Guard fd with unique_fd in C2OMXNode::emptyBuffer" into qt-dev
am: 0963d443b0

Change-Id: I973d351f08a2d08873a2247a85e9c6f73b85faba