Abdul Rivai, Indonesia