am 5848c458: am f69624a1: Merge "Remove dead files."

* commit '5848c4589a256bef0ecfda2df3ce53c3e980309b':
  Remove dead files.