Fix broken headers

Some headers are missing dependencies.

Fix to oj-libjdwp is being submitted independently via appropriate
channel.

Test: NA
Bug: NA
Change-Id: I9f5187cf8cf03854183fa9bc62be13b179b65b89
2 files changed