Merge change 1364

* changes:
  Replace acc.c with the contents of otccn.c, update tests.