am bfc584df: Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev

* commit 'bfc584df683a84dffd8e04b7b13f619606a0a42a':
  Use app directory as apkPath for cluster installs