Revert "frameworks/base: Fix build in ISO C++11 mode"

This reverts commit 8a571ade5adef9a764daaef25e7374e5de4cff2b.