Merge changes I19f5e534,I298f9bb3 into msm-3.4

* changes:
  arm: cache-l2x0: Add event monitor bit shift
  staging: ashmem: Fix the build failure when OUTER_CACHE is enabled