fix build in jb
Fix alogi comment, no code change

Change-Id: Ib48035fb1391aba3dabe8fc449c147f5c038ce3d
fix omx LOG_TAGs, LOG > ALOG (squashed)

Change-Id: I0bf7be6aadd7cef7ddfb3999fdcf4cd1ad901b88
Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
clean-up: remove unfinished and broken AndroidNativeBuffer code

Revert "VideoEncoder: Store ICS OMX storeMetaDataInBuffers parameter"

This reverts commit 54d0cc23eb07735b6b05f3b60444dcc3520c8f24.

Change-Id: Ia151c222f014c5bb46f087330427cf8e68c2be0f
reduce aac buffers to 1
Merge branch 'jellybean' of git://github.com/CyanogenDefy/android_hardware_ti_omap3-compat into cm-10.1

Signed-off-by: David Rodero <david@codiguiel.net>

Conflicts:
	omx/system/src/openmax_il/omx_core/src/OMX_Core.c
	omx/video/src/openmax_il/video_encode/src/OMX_VideoEnc_Utils.c