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

Change-Id: I33220d6abfd236fd37a3b348f0afdf674904f563