Fix the run-test makefile. (cherry picked from commit 4adc26e8) Change-Id: Iccd64165e70a3e18cd966289f150f053b091ef7c