Revert "Fix confusion about whether or not output() should be const"

This reverts commit cf8539b0a7f4f47029898eeaf80b50cbbf466ba6.
Revert "hwui: Fix build in ISO C++11 mode"

This reverts commit 51080700f47636f4d6322c7ad2f0e07a23645255.