Stop using a gcc 4.6 patch

We require 4.8 anyway
Configure: match more NDK versions