Merge "Make libvendorsupport_llndk_headers available to APEXes" into main