stagefright: Fix tunnel mode ifdefs

 * Was breaking on 8660 due to previous commit.

Change-Id: Ia9f5c45552cc933db336a66b6d1214b65e810488
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1