Revert "hwui: Fix build in ISO C++11 mode"

This reverts commit 826c1a67dd61b20545a77482a33d320d202352a3.