Add support for galaxy s2 and nexus4

Change-Id: If35035024a679b652cc8ba7f6d8e8e07b521c92b
clean up

Change-Id: I85cce227a4a1f37f40a9133869f85504f013a3aa