Merge "Fix packaging of emulator hardware ini file." into idea133