Revert "Use -O2 for now"

This reverts commit 790fc3c60a9255236f4e1244eb78efcb66954b52.
FIX

Change-Id: I4faf0dcfab6c8fdbb2a93b80163077e8104b94f9