Merge "Remove logic to fake /system in overlayfs"
am: d2ae1c91ed

Change-Id: I2878c258682defa379cf4a9bc68fad17e0f2c63f