[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Add crashutils to cts, and integrate into Stagefright"" into oc-dev am: 36b32d947c am: 4b894008f6 -s ours am: c95b8b889f -s ours
am: 4e2b34e6fc -s ours
am skip reason: change_id I6fbe5c08364da102056fbbf0115ec3bc7bd4b155 with SHA1 6f80be06c4 is in history

Change-Id: Iee40e9e44453d56a0cb2c507c136acbb9237ec04