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

Change-Id: I6a625ae2ccf501e795119f77804f1325d914a66d