Merge changes I308adc69,I2db4f823 into msm-3.4

* changes:
  arm: Support the safe WFE sequence for Krait CPUs
  arm: Convert spinlocks to new inline assembly style