It's not useful as it means we test code at a different -O level than we run it at. Fixes build errors caused by gcc 4.3. Fix some warnings the change would introduce as well. Change-Id: Id9ff31dc08694b0bfc5272f5e690c41f7918ed22