Merge changes I57a94d2f,Ifb305185

* changes:
  test/: remove some unnecessary extern "C"s
  rtcd.sh: add extern "C" to generated headers