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

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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3349368



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