Merge git://git.linaro.org/nico/arm_security into devel-stable