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

Change-Id: I60b004f006ed1b4ec0823c95438e9b3e41bdc949