Merge changes Ide01c994,Ia9f12a7b

* changes:
  Revert "Autogenerate connectivity jarjar rules"
  Revert "Clarify comment in gen_jarjar.py"