Merge "init: use '/system' as the system mount point for force_normal_boot"