Merge "arm: Add definitions for pte_mkexec/pte_mknexec"