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

Change-Id: I81d288a1047defedb0d0714bea2703b56e7c7dfc