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