am 161a7d91: Merge "Re-create build directory if using existing one fails"
authorPyry Haulos <phaulos@google.com>
Mon, 13 Jul 2015 20:13:39 +0000 (20:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 20:13:39 +0000 (20:13 +0000)
* commit '161a7d91069ee940becd1589e3e9f95802cab4ec':
  Re-create build directory if using existing one fails


Trivial merge