Merge "init: do not fork before doing (u)mount_all()" am: fc1749280c
am: 83cf2f5381

Change-Id: I5372299f7f6ac94c05754b40e7f5ecb8812b5df8