This makes motion by function easier in some editors (such as Emacs or
vi), which get a bit confused by

  #if 1
  foo {
  #else
  foo {
  #endif
    bar;
  }

Change-Id: Ie9d8c34d3b9fafdac634db5f3647f3cc1611ebee