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

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

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