aw: Do not merge kModeProcess into kModeDraw

aw: Do not merge kModeProcess into kModeDraw

This no longer happens on Android L, and we have grown to rely on this
behavior in some gpu scheduling code. Not bothering with refactoring
code that work, but just match L behavior in the test runner.

testNoUserScalableQuirk and testPageDown were flaky in hardware mode
due to this bug, so make it run in hardware mode again. Fix style in
these file too.

BUG=428355
Committed: https://crrev.com/fbf6a309b2c25e63cf982d070c732f4ebbfd55ad
Cr-Commit-Position: refs/heads/master@{#302891}

[boliu, 2014-11-04 23:04:54]

boliu@chromium.org changed reviewers:
+ sievers@chromium.org

[boliu, 2014-11-04 23:04:55]

And functor in instrumentation fix

[no sievers, 2014-11-05 21:41:59]

lgtm

[boliu, 2014-11-05 21:46:23]

The CQ bit was checked by boliu@chromium.org

[commit-bot: I haz the power, 2014-11-05 21:47:21]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/689473005/40001

[commit-bot: I haz the power, 2014-11-05 22:43:17]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2014-11-05 22:43:58]

Patchset 3 (id:??) landed as
https://crrev.com/fbf6a309b2c25e63cf982d070c732f4ebbfd55ad
Cr-Commit-Position: refs/heads/master@{#302891}