Only add goo.im props if the build is not unofficial

Change-Id: I60f37a9dde459875d62bdd85843f0b0079d9bb86
Merge "Only add goo.im props if the build is not unofficial" into jellybean-mr2.1