Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common

* android-3.18:
  Fix for in kernel emergency remount when loop mounts are used
  pstore: pmsg: return -ENOMEM on vmalloc failure