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

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