Removed android tags (don't work), removed C++ sources