Merge "Fix tests/runtests.sh"
am: be62c313ad

Change-Id: I90b51e0fd0a14d03f4b0ea7a05a0c5dd08ca8708