am bc9cac17: Make Gesturebuilder build like a sample.

Merge commit 'bc9cac171505afbf4ecdb5eabb849c98cac1bddc' into eclair-mr2

* commit 'bc9cac171505afbf4ecdb5eabb849c98cac1bddc':
  Make Gesturebuilder build like a sample.