galaxys2: move device settings from i9100

Change-Id: I9209974db9ce5b013fc56f2249ff8b4c511d5eaa

Conflicts:
	Android.mk