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

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