Fixed bad replace tokens and removed unnecessary quote
Fixed bad replace tokens
Fixed Eclipse classpath file for ADT r22
Merge remote-tracking branch 'origin/master'