Merge "goldfish_logcat:  remove permissive_or_unconfined()"