am bdaee5ea: (-s ours) am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcel

* commit 'bdaee5eaa345ee9b1e5ddcb921565c4d127ceb8d':
  DO NOT MERGE stagefright: fix AMessage::FromParcel