Fixes for NDK r8d compilation, also added missing NDK r8b patch