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

Change-Id: I1394036be13046dd7957326000fef65ee498306d