Merge "fs_mgr: overlay check shared blocks for / if /system is not" into qt-dev
am: 664193a62e

Change-Id: Iaefb4d5c4bc0fb67aa977e9b1a13b9c0f1c2d1a6