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

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

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



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