Stop explicitly adding bionic subdirectories to the include path. am: 13bc0b8a37 am: 8966df7101

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/3341879

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