modify android.mk
fix conflict of android.mk
fix comments
add license and credits
Merge pull request #41 from Ryeeeeee/master

add license and credits