Merge "overlayfs: Refactor how the scratch device is deduced, again." am: 81fbcbdbd4 am: 5924eeb4a4 am: 55f4e37994

Change-Id: Ic1354fe1b7cbb362fc7d047e7147a6386f8acc8e