Merge "Fix bad import in VideoDumpActivity"