Merge "Don't manually add an include directory you're getting anyway." am: df5962f6cb

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1406348

Change-Id: Id6645696164cf472a2f5dfaa7e7f01c40da906f6