am c542d114: am 67cfe0c0: Merge "Allow apk path to contain one subdirectory." into lmp-dev

* commit 'c542d1141d8e54d6224295bded87c55c16bd5f8f':
  Allow apk path to contain one subdirectory.