Merge "libfiemap_writer: Handle dm stacking more accurately." am: 43d9ced663 am: da64dc5322
am: 6e439bf7b2

Change-Id: Ic305f22d90b88216fd69bb8e2b9825b293758949