Ensure /data/adb exists automerge: 6672300
automerge: ac12f25

* commit 'ac12f25004d728fe117c058446fccb0ca0a397c9':
  Ensure /data/adb exists