Merge \\"Fix up mangled SELinux labeling of wallpaper files\\" into nyc-mr1-dev am: 87488ac89b
am: 6e78e3a955

Change-Id: Ided20fd0096205b2e93f6729408ac3c455f76e9f