Fix Addon.d for Google Now and Wallet

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

Fix Google Now Addon.d Script