Trebuchet: Fix scaling for some devices

Commit 'Adding specific buckets for N5 in dynamic grid' was not merged
correctly. The Nexus S profile was removed and Large Phone duplicated.

Change-Id: Ifc439e8d4a4840efe0da543cf30fbeb134972bb3
Merge remote-tracking branch 'upstream/cm-11.0' into HEAD