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

Change-Id: If7c5aff8c9a5e71fd600118a6539d904bc0d1429