Merge "goldfish: support system_ext"