Merge "Ensure /data/adb exists"