Revert "endeavoru: fix build errors."

This reverts commit bcbb5dbcf666a5f6f7dcb934decd5fe594c2bce3.

Change-Id: I9e8946b3b68d516498b6552586347f57d2e2ca0d