Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev
am: 33f2b3b3b1

Change-Id: I212a872da24ea6e64a90e3339cfc9e68f2eaa933