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

* commit '7010c4a5d35e26b492cfc4f85bb7f5f707682f35':
  Remove two obsolete files.