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