Merge "update runtest due to libcore location change"