Fixed mounting /system when 'override_prop' is enabled.

Change-Id: I59f035498c2a2d65869cb7f7e6ea9e311b9757be
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0