Merge "Add riscv64 support for installd testcase"