Merge "Revert^2 "Deprecating libvendorsupport_llndk_headers"" into main