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

Change-Id: I50ffa8e1dd0da80e9adb20c072598069fde856ab