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

* commit '0e86f9f105521095e081c9628d9ddb777c83f42c':
  DO NOT MERGE stagefright: fix AMessage::FromParcel