base

Merge change 8242

* changes:
  Make intent broadcasts in "am" synchronous (they wait until exit). Clean up error handling and reporting in "am". Make the usage message for "am" more informative.