Merge "Add riscv64 target in Android.bp.in"