am aeb980bd: Merge "uncrypt: package on non-data partition should follow the right path"

* commit 'aeb980bd8958e3c6e135835aa7d34b5c4e3a601b':
  uncrypt: package on non-data partition should follow the right path