Merge "Revert "Move rild from public to vendor.""