Merge "qemu_props:  remove permissive_or_unconfined()"