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

Change-Id: I788c56f7696622c4db617b9b255a084b8554437f