Merge "remount: Use /data for backing scratch storage." am: 21dcbd15bc

Change-Id: I8ab5ad02a2ae1e465cb300c106ee6d5967506da8