Merge "Set ANDROID_ROOT correctly for host in test script."