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

Conflicts:
	include/utils/Unicode.h