Merge "Stop explicitly adding bionic subdirectories to the include path." into main am: d68632becc

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

Change-Id: Idae44755f445ac9aaee0767842667209075418c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>