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

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