Merge "Add write support to SplitFiemap." am: e9223204d3
am: d7b62eb77e

Change-Id: I638f4ea65a70439ae14d94b6f2138482a41753b3