Fix includes for other media variants

Based off http://review.cyanogenmod.org/#/c/51031/

Change-Id: Icfd33be4ee16f24919fe2f8f44cb08f3df1d0a4c
Revert "fm: fix openRecord prototype"

This reverts commit 89ad23a2d0ebc317e62ffb87e048469b1df3d69e.

Change-Id: Ided3ea4b0d9b88d604cff18c0fa7ed2a8e2c072e
Revert "fmradio: use caf naming"

This reverts commit 7f37b3b4ce2f98576da1d334f1ee5b77dab5e2a8.

Change-Id: Ie180a9193b65ff8c68ea6f2401bc3b21e55f849c
Revert "FM Radio: Add support for FM Radio in Android"

This reverts commit 3142d888bba540849071804d14e1313271cba56c.

Change-Id: Id6a8f16f27529d734d36da89bc9041f693af5b75
Merge "Fix includes for other media variants" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into HEAD