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

Change-Id: Ib29c1d5c4551943fb68a21dc86af8f6546a4c423