Revert "add guard for extra includes"

This reverts commit 037d78f84134de6f24ad0df2faa4d6ff0e185790.

Reason for revert: did not help, will fix caller

Original change's description:
> add guard for extra includes
> 
> Bug: skia:
> Change-Id: Id500cb6ac6c2f4a925135a8e83ed4f2a07b73661
> Reviewed-on: https://skia-review.googlesource.com/17162
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
> 

TBR=reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Bug: skia:

Change-Id: I6d7dd1c51ca81a6c24604ff509b31c2171b26314
Reviewed-on: https://skia-review.googlesource.com/17163
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2 files changed