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

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

Change-Id: I7953e6e5317121098e82f5cb9abfac4c4255d203