[automerger skipped] Merge "fs_mgr: overlay check shared blocks for / if /system is not" into qt-dev
am: 664193a62e -s ours
am skip reason: change_id Iffa7c5f24d8f409e71f89fe9ece274d8c476f6fc with SHA1 d6ef9d2411 is in history

Change-Id: If5503c1cf15d2bee2f1a0e1312f0839dd7da97cb