Remove remaining aliases to self.droids and self.eds

Change-Id: I89af28a2fa45af6f8ddd30db8f7d3f72862c3ca3
(cherry picked from commit 653b27331c2c06f31d72bfda2aaa910f5dc8b2d3)
8 files changed
tree: 7534f804a43ffa8a275d34e7ee789c8c4ba8f321
  1. acts/