qcom: fix errors inside ALOGV

Fix errors exposed by adding compile-time checking to disabled ALOGVs.

Change-Id: I3578e2829e64d49c8dd967c8b4ed23ecbdb48a87
media: Avoid collision with FFMPEG plugin

Change-Id: Ica2cdf9f6572ec18f396d25758cbb2be1359ac0b
Merge remote-tracking branch 'cm/cm-11.0' into kitkat