Merge "cryptfs: kill processes more quickly in wait_and_unmount()"