Merge "Allow mkfs on device-mapper devices." am: 18f8033e55 am: f6da592680
am: d44e30cc95

Change-Id: I608a84f1175ef8ada67c06e8d6c9b62e520f3f50