(Android) Bump up to version r11
(PS3) Get rid of ifndef