Merge "Revert "[RESTRICT AUTOMERGE] Add crashutils to cts, and integrate into Stagefright"" into oc-dev
am: 36b32d947c

Change-Id: I2d540a32d49a5dc4b2331ce89fcc37bcc45183fc