Merge changes I58b03acd,I7d7eb086 into nyc-dev

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