Revert "raviole: remove redundant includes"

Revert submission 13885469-whi-common-folder-post

Reason for revert: Those are not redundant. They are needed for AOSP builds.
Reverted Changes:
I43557b667:raviole: remove redundant includes
I7a5981fae:blueport: remove redundant includes

Change-Id: I21c98ac4876c8cbab96b9d8af5967103cf6eb9ee
2 files changed