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

Change-Id: I5cae48a9bf110a24539ef66531a408dcc3a15fd2