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

Change-Id: If8fecdd155c28fb8738756ad51cd131f0c62d4de