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

Change-Id: Id5d27476aee25c6019adb4f2ccee9dee580da497