Merge "apexd: fix race condition in dm-device manipulation"