am c05b83d1: am 84086578: Add timestamp to monkey log
Fix etc1tool on Mac SDK: -lz was missing.

Change-Id: I50f5500493be638182d3302cae2e2385722da22d
Runtest support for tests that need 'make' not 'mmm' to build.

Change-Id: I0508db2578826249f9bf4756d5adc6f95e841231
Merge commit '0db059b4c819ca0f4ff1ff3470dff940b110d400' into oxygen_4.3

* commit '0db059b4c819ca0f4ff1ff3470dff940b110d400':
  Fix etc1tool on Mac SDK: -lz was missing.
Merge commit '8dc9eb8ba63229e4fd9b97383b82e3c8f76ee89c' into oxygen_4.3

* commit '8dc9eb8ba63229e4fd9b97383b82e3c8f76ee89c':
  Runtest support for tests that need 'make' not 'mmm' to build.

Conflicts:
	testrunner/runtest.py