update to work with newer android sdk, resolve class path issue.