Fix darwin run-test problems

Bug: 17428908

(cherry picked from commit 8a4064e2c0987637b11afcc656478d3113d81618)

Change-Id: Ica403bef3e7d93bf6e9197c44b77e39683e04d55
2 files changed