Merge "Add riscv64 CtsShim APKs to the build rules"