am aa70ca22: Merge change 9077 into donut

Merge commit 'aa70ca22d1e0cf6c15579e2f90b23bfb0f941792'

* commit 'aa70ca22d1e0cf6c15579e2f90b23bfb0f941792':
  Make GestureBuilder build under the SDK.