Merge "add "startservice" option to am command-line utility"