Fix more compile errors under Xcode 5. Bump apto submodule to include its Xcode 5 fixes as well.