Added Nexus 7 and removed Galaxy S

Signed-off-by: Andreas Pohl <apohl79@gmail.com>