Fixed mounting /system when 'override_prop' is enabled.

Change-Id: I59f035498c2a2d65869cb7f7e6ea9e311b9757be
(cherry picked from commit f8fc117f370e87ac431f685afc35e455e5d7af94)