Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_av into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_av into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_av into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_av into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_av into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_av into cm-10.1
custom domx: refactor ENHANCED_DOMX and only use DOMX_PATH checks in Android.mk

Change-Id: I597973b9179cab68834a6f8dc9eb45f43c4af735
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_av into cm-10.1