Merge changes I16f522e7,Ifa5b3bc2 into msm-3.0

* changes:
  Merge branch 'google-android' into msm-3.0
  locking, kprobes: Annotate the hash locks and kretprobe.lock as raw