am c02c35fb: Merge "restorecon /data/media when re-creating it for multi-user upgrade."

* commit 'c02c35fbdc90acbb6483fddd9a8822a16a63689d':
  restorecon /data/media when re-creating it for multi-user upgrade.