Add livewallpaperpicker back to the only one of our devices that doesn't build it now

Change-Id: I9f75eaa3738287fe6e1a0fee797bc9b6f6223ea6
Consolidate common tuna stuff

Change-Id: I7282c08d885f3db6e7311d29475448bc0f9e6b1d