am 20dfbb0f: am fa66b4e1: Merge "Remove long-obsolete file."

* commit '20dfbb0fd1dbe467ecfde3309f1abdbb01608ead':
  Remove long-obsolete file.