Merge "Revert "Deprecating libvendorsupport_llndk_headers"" into main