[Android] allow for variable NDK header version
Merge remote-tracking branch 'upstream/master' into patch-1
(Android) set APP_PLATFORM defaults in case not compiling from libretro-super
Merge pull request #885 from l3iggs/patch-1

[Android] allow for variable NDK header version