Merge "goldfish_setup:  remove permissive_or_unconfined()"