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

Change-Id: Id2ac5f42b980a6ebf65813702e5ae8cd346d00f9