Merge "Add stopservice command to am"