Merge "Stop explicitly adding bionic subdirectories to the include path." into...

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

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



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