am abc25e36: Add intent for gservices override, and handle empty arguments...

am abc25e36: Add intent for gservices override, and handle empty arguments properly in the "am" utility.

Merge commit 'abc25e3679a9de2625eadf3e3050a6973f7a6c71'

* commit 'abc25e3679a9de2625eadf3e3050a6973f7a6c71':
  Add intent for gservices override, and handle empty arguments properly