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

Change-Id: I2f27fb8ebfd32a2c97b2f2014b261f67b49a208b