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