change package name to a legitimate one
Merge branch 'master' into android