am a01b6467: am 772f6e2a: Merge "correctly mount tmpfs as /tmp in recovery"

* commit 'a01b646794fc207da657d7b8ef779c9d842acfde':
  correctly mount tmpfs as /tmp in recovery