Merge "Update OMX VPP component to fix static analyzer issues"