Remove diablo/essex conditionals.

The stable/diablo and stable/essex branches are closed.  Clean up
custom logic for those branches.

Change-Id: I54cd2a273e62d92a4cc5436481e96764226fa7a4