am d53c0f34: (-s ours) Removed unused files. Do not merge.

Merge commit 'd53c0f349380bbd3dca7542b235625b780fee3bb'

* commit 'd53c0f349380bbd3dca7542b235625b780fee3bb':
  Removed unused files. Do not merge.