Merge "Add shared jarjar rule for tethering tests"