fix make_release script
Merge branch 'master' into xperia_p