merged android lib project back into the android project.
updated list of files to ignore.
update cleanup
Merge pull request #1191 from ne0fhyk/merge_android_lib

Merge android lib