Update to SDK 22, fixed a couple of lint warnings in test project.