Merge "init: fix first stage mount failure due to /dev/device-mapper not found"
am: 0447a3e5d1

Change-Id: Ie0ad21fc28ea7a692ef7b3dfbb663e8f6f3dfe93