Merge "Merge "Enable host libbcc even on unbundled builds" am: 9537e74c9f" into main-16k