try to keep S5PC110 alive

Conflicts:
	opengl/libs/Android.mk

Change-Id: I2231762921b8816dfe452cc0cb884a1c37b34ded