Merge "init: early_mount: removing hard-coded paths" am: f719c255fa
am: 0d0519c98c

Change-Id: Ia0e9b1c2980950772f0958e6d2c9929ae5812bc4