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

* commit 'cf96dc867d5bd5527640ccea8b391fa9d30a3250':
  Remove dead files.