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

Change-Id: I416e0cc81aa5ef54bb55a15002c91a422942a44b