Merge branch 'qcril' into cm-10.2

Change-Id: Iffff4df802216608187eedd82999cdfe5cca30f1
Hide InputDevice.SOURCE_GESTURE_SENSOR from API

Change-Id: If009e9595fc593594b0e7764669996de137483a1