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

Change-Id: I9a51bd044973eaf6bde8a06b4aed77d3ce1f7917