am 8315bb49: (-s ours) am b2fa7700: DO NOT MERGE Modify Monkey so that scripts can use raw and user events.

Merge commit '8315bb4933c49d45f6b080cc8fd46f0bfadeee51'

* commit '8315bb4933c49d45f6b080cc8fd46f0bfadeee51':
  DO NOT MERGE Modify Monkey so that scripts can use raw and user events.