Merge "Support FiemapWriters that extend across multiple files." am: 925c78b7e8
am: 461c245b2e

Change-Id: I033fa0548bcbf3fd7e64336c8bdd04463abbb5e5