updated package tool: right version number for yota branches
Merge branch 'master' into ice-cream-sandwich