Bug 948462 - Fix SIMULATOR=1. r=yurenyu
Merge pull request #14537 from ochameau/simulator-1

Bug 948462 - Fix SIMULATOR=1. r=yurenyu