Merge "Add microdroid_vendor"