Merge "netjniutils: delete support for android R" into main