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

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