Merge branch 'androidrbox-master'
Allow it to link on Linux with gcc.