Intergrate Viper4Android into settings

Change-Id: I5c97efb4c2ea786d0ca6d8a6a6b4cb2586e471a6

Conflicts:
	res/xml/liquid_main_settings.xml