Fix includes for other media variants

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

Change-Id: Icfd33be4ee16f24919fe2f8f44cb08f3df1d0a4c
frameworks/av: Fixup after squashed commit of media features from CAF

 * Fix makefiles and ifdefs
 * Remarked out one line in MPEG4Extractor.cpp due to compile error

Change-Id: I40a8b12f8ca3fe0f372d68b0e3cf02aa33ffe3c3
remove mark out

Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>