Merge change 24764 into eclair

* changes:
  Add @Widget annotation to GestureOverlayView to make it usable in ADT.