fixes Bug 924359 for Nexus S devices

This is a minimalist patch to switch nexus-s manifest from linaro to CAF.  I just tested this with the master branch and got a successful build.