am 4bd8f46c: am 73b61dd2: am 12a68607: (-s ours) am 4189eb41: am 0e86f9f1: am f888d47c: am 91f5dc8f: am bdaee5ea: (-s ours) am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcel

* commit '4bd8f46cf6d4a05361fdbdfb39510c0197b1f2ec':
  DO NOT MERGE stagefright: fix AMessage::FromParcel