am 2978ad4c: Merge "Remove two obsolete files."

* commit '2978ad4c6d660f02ff0a1742749b6818b2616b69':
  Remove two obsolete files.