Merge "Add include directory to -header-filter" am: 06e1b6c3cc

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1597354

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3ec50bd9f273c9ccf1ea44953cccf4a57e0a10b