Merge "selinuxrelabel: Add a check for dalvik-cache" into cm-11.0
(cherry picked from commit 3aff048601a0a40a422477b3f4570c41b4fb5e16)
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_vendor_cm into cm-11.0

(cherry picked from commit 80bd41d4a09502a1d89173420973d46ebc289876)

Conflicts:
	config/common.mk