Merge "Add support for option `--android-runtime-root` to ART run-test scripts." am: 6f463e87c9
am: db3e48aba0

Change-Id: I367f92cf44b98b52189726fd3854503ef4fb8b81