unused import
Merge branch 'master' into android-1.5
imports cleanup
Merge branch 'master' into android-1.5