Merge "ARM: Print BUG instead of undefined instruction on BUG_ON()" into msm-3.0