oppo-common: Disable option during bringup

Change-Id: I777c0536fe80ded587b44446cf19accf986d474c
oppo-common: Temp disable some gesture code

 * Until proximity feature is ported

Change-Id: I9542b5b96a67b45d8dc79405eeb6416ab8444a4c
Merge remote-tracking branch 'cm/cm-12.0' into HEAD

Conflicts:
	configpanel/src/com/cyanogenmod/settings/device/KeyHandler.java

Change-Id: I7a3cfecca18516ae71cccbb645b43fe6aa966f5a