Merge "fs_mgr: target-agnostic device-mapper helpers"
am: a6a266af00

Change-Id: Ia6143d184812c5cd5c08cc0a5e4836468200547b