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

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