[automerger skipped] [RESTRICT AUTOMERGE]: Fix StagefrightTests am: 67f3fd5a36 -s ours
am: 3fa4be3302 -s ours
am skip reason: subject contains skip directive

Change-Id: I03e4d1a6b9a3a4ec43b5c9a37fd35db32276300b