Merge "Improve checks for include dirs outside the source tree"
am: 9e0b4ed82a

Change-Id: I4141a42e7cba1ed0e9981831f3b02fbd235f4fb1