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

Change-Id: I63edc074953f99005f7e7b6fb53357fe7e9a085f