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

Change-Id: I77fc54edc7401bfc93541dcc196b416663666357