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

Change-Id: Ib82969daab218360712f1b3bf2c2069c95932ee2