Merge "stagefright: Add null check before passing meta data buffer"