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

* commit '91f5dc8fce9c37239216a01d78d771ef7592baa2':
  DO NOT MERGE stagefright: fix AMessage::FromParcel