am f3495c36: am 57282562: Merge "Allow apk path to contain one subdirectory."

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