Merge "init: mount_handler: system-as-root (legacy)" am: a896e2aee5 am: 7bf190aa32
am: 6ecebbf94f

Change-Id: Ibe9647f702883eba8cfdb6135baf664b67c6968e