Merge "Avoid using FileDescriptor#getInt$() on R" into main