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

Change-Id: I8664f899cd746ec6f569e83f1e1b7b13504f1af0