g++ warnings turned into errors. This reverts commit 68a5fefa. Change-Id: I09bb95d9cc13764ca8a266c41af04801a34b9fd0