Merge "Including WallpaperPicker in SDK build" into oc-dev
am: 8f5c5fd7fe

Change-Id: Ie86990841f4869fdb9c1699910b794313d26c42d