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

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