Merge "Keep emma files for host rules"