Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously." am: ee5eb39169
am: 5973b8cf00

Change-Id: Ieb48b5b3ca4e5576d22b7db9bcc229b8fb2f47fb