Merge "Migrate droidstubs/droiddoc to flags" into main