am 2ab0a572: resolved conflicts for merge of 550bd340 to mnc-dev-plus-aosp

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