[automerger skipped] Merge "Fix tests/runtests.sh" am: be62c313ad
am: bd8311c115 -s ours
am skip reason: change_id Id4a33ca89fa21a9a4ef791c5c1c5760e0e2badaf with SHA1 f442263a08 is in history

Change-Id: If56f400aecaa4c5c39c4817878fd1e2b9410ae26