am 147de7e1: am 37d70f53: am c0b4b8b0: Merge "Ensure /data/adb exists"

* commit '147de7e147c9a85158f79b6aeffd87af6b921690':
  Ensure /data/adb exists