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

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