updated android 3rd party; moved android source files to new locations