fix up some ifdefs from the caf squashed patches

 *also unmark some files as executables

Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
TEMP: comment out to fix compile

Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
frameworks/av: Fixup after squashed commit of media features from CAF

 * Fix makefiles and ifdefs

Change-Id: I40a8b12f8ca3fe0f372d68b0e3cf02aa33ffe3c3