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

Change-Id: I8f76715c22c456b2b0aa1dcff88953487ee7399d