am 14bb68e6: (-s ours) Remove unused files. Do not merge.

Merge commit '14bb68e616dccb16a97bf9461987d1e24ed5426a'

* commit '14bb68e616dccb16a97bf9461987d1e24ed5426a':
  Remove unused files. Do not merge.