am cecd02c1: Merge "emulator: Remove the global Make variable trick for emulator-specific system modules."

* commit 'cecd02c1ba1180b774063d779f89a18bce78f029':
  emulator: Remove the global Make variable trick for emulator-specific system modules.