Revert "system/extra: include more of what you use."

This reverts commit aa24bc89b78a5981df7618bdef78b7b49ffad14d.

Change-Id: If55eb0effc582f1cfa329bab8d7504ad4964f67e
2 files changed