C++11 fixes.
ADB: Don't force -O2 if something else is provided instead.