am ef87594b: Merge "libstagefright: Fix crash in convertMetaDataToMessage" into lmp-dev

* commit 'ef87594bd821520cdc46e30036c16ee2eb5becb3':
  libstagefright: Fix crash in convertMetaDataToMessage