commit 96afd64a707892eb39a99f01b81a479ddae04321
author Trevor Johns <trevorjohns@google.com> Fri Aug 09 14:02:29 2013 -0700
committer Trevor Johns <trevorjohns@google.com> Fri Aug 09 14:02:29 2013 -0700
tree 4c6f8ceb97607fc5a50ca4599761ee98c7713b04
parent 0dededaefd3761a365888e9827c73fb9d5e33f48

Delete orphaned directories from upstream rename.

These directories should have been renamed/deleted in
commit:

    e8f118359ff0253bb402f19e7b728b112cc4a546

which was merged into developers-dev at commit:

    5278f8ccf33662d89ccb6a1533ce81912ec6d422

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