Merge pull request #2525 from kluppy/master

Don't chmod in Atomic on android (fixes  #2472)

lib/osutil/atomic.go

@@ -37,11 +37,14 @@ func CreateAtomic(path string, mode os.FileMode) (*AtomicWriter, error) {
 		return nil, err
 	}
 
+	// chmod fails on Android so don't even try
+	if runtime.GOOS != "android" {
 		if err := os.Chmod(fd.Name(), mode); err != nil {
 			fd.Close()
 			os.Remove(fd.Name())
 			return nil, err
 		}
+	}
 
 	w := &AtomicWriter{
 		path: path,