Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev