Merge "Make librdroidtest available to vendor as well" into main