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