Revert "ndk: Merge crystax5beta3 for compatibility with XBMC compilation"

This causes issues with kitkat compilation

This reverts commit cac19d1a6f2cf3d528f4c632a12c8e41e0d4d97b.