Delete orphaned directories from upstream rename.

These directories should have been renamed/deleted in


which was merged into developers-dev at commit:


The automerger did something strange when generating this
merge, and it seems that the files were copied without a
corresponding delete, and only in this branch.

Deleting them again to rectify branch state.

Change-Id: I538f554a2581571d08763ae53a796a1f2ac2d2f2
42 files changed