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