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

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