Fixed classpath bug and Lint warnings new in Android SDK 22

SDK classpath bug means libraries aren't included - adjusted classpath
to deal with this. See:
https://code.google.com/p/android/issues/detail?id=55304