Merge "Allow BLKIOMIN and BLKALIGNOFF to super device in update_engine."