Merge branch 'android-3.18' of ../../android/aosp into linux-linaro-lsk-v3.18-android

* 'android-3.18' of ../../android/aosp:
  ANDROID: exec_domains: Disable request_module() call for personalities
  UPSTREAM: pagemap: do not leak physical addresses to non-privileged userspace