Merge changes I58b03acd,I7d7eb086 into nyc-dev am: 0d0a8b48d2
am: f1a0ec37b9

* commit 'f1a0ec37b9edd755ba95835acedd6673dfd947e2':
  stagefright: untangle metadata-mode handling
  stagefright: add a way to update native handle in OMX buffers

Change-Id: I9d1b51e1c6f486f1c8fe36383adcc4261b056256