classpath fixes for R22
bug fix, classpath fix for R22, and minor formatting
Retrofit and Picasso sample apps