Merge "Revert "Add microdroid_vendor""