Fix Addon.d for Google Now and Wallet

Fix Merge Error and Addon.d Now/Wallet Error.

Fix Google Now Addon.d Script
Merge branch 'master-rebase' of github.com:dotmaniac/famigo_gapps into master-rebase